merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Thu, 16 Aug 2007 16:47:33 +0000 (10:47 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Thu, 16 Aug 2007 16:47:33 +0000 (10:47 -0600)

Trivial merge